mount-operation: close the password entry on operation abort

If the device disappears in the middle of a mount operation, make sure
to dismiss the password prompt automatically.

https://bugzilla.gnome.org/show_bug.cgi?id=673787

diff --git a/js/ui/shellMountOperation.js b/js/ui/shellMountOperation.js
index f7fbb18902b96b95a69bc0e6bc9dce0fea1d65fb..b91850fa261427a25dd55e2b7e23f10e2e6a1109 100644 (file)
--- a/js/ui/shellMountOperation.js
+++ b/js/ui/shellMountOperation.js
@@ -157,11 +157,19 @@ const ShellMountOperation = new Lang.Class({
     },
 
     _onAborted: function(op) {
-        if (!this._dialog)
+        if (!this._dialog && !this._source)
             return;
 
-        this._dialog.close(global.get_current_time());
-        this._dialog = null;
+        if (this._dialog) {
+            this._dialog.close(global.get_current_time());
+            this._dialog = null;
+        }
+
+        if (this._source) {
+            this._notificationShowing = false;
+            this._source.destroy();
+            this._source = null;
+        }
     },
 
     _onShowProcesses2: function(op) {